Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Short aliases for git commit --amend (bang) #2218

Merged
merged 1 commit into from
Nov 6, 2024
Merged

Conversation

bittner
Copy link
Contributor

@bittner bittner commented Sep 28, 2023

Description

With a bang (!) character we can make amending a commit intuitively dangerous.

Motivation and Context

The idea is taken from Oh-My-Zsh, https://github.com/ohmyzsh/ohmyzsh/tree/master/plugins/git

How Has This Been Tested?

I use those aliases for years on my developer laptop. I just made the identical changes to a fresh installation of bash-it on my developer machine. They work as expected.

Checklist:

  • My code follows the code style of this project.
  • If my change requires a change to the documentation, I have updated the documentation accordingly.
  • I have read the CONTRIBUTING document.
  • If I have added a new file, I also added it to clean_files.txt and formatted it using lint_clean_files.sh.
  • I have added tests to cover my changes, and all the new and existing tests pass.

@bittner
Copy link
Contributor Author

bittner commented Sep 28, 2023

The failing of the CI / lint job is likely unrelated to the changes introduced in this PR. – Go error: undefined: any

@bittner
Copy link
Contributor Author

bittner commented Nov 2, 2023

This would be a nice enhancement of the Git aliases. Please, merge!

@cornfeedhobo
Copy link
Member

@bittner Could you rebase or amend, then push? The CI runs are too old to re-run.

With a bang (!) character we can make amending a commit intuitively dangerous.

The idea is taken from Oh-My-Zsh, https://github.com/ohmyzsh/ohmyzsh/tree/master/plugins/git
@bittner
Copy link
Contributor Author

bittner commented Nov 3, 2023

@bittner Could you rebase or amend, then push? The CI runs are too old to re-run.

Done. CI jobs all pass. Ready for merging?

@cornfeedhobo
Copy link
Member

@davidpfarrell @NoahGorny @gaelicWizard Any interest to weigh in here? This introduces the ! suffix. I'm inclined to merge because I've already said I don't think we should be managing these and thus have little opinion on what conventions should be followed. Please let me know soon :)

@bittner
Copy link
Contributor Author

bittner commented Nov 7, 2023

Note that the bang is inspired by OMZ, hence we're harmonizing with the other framework, which I think is considered a good idea judging from other discussions in this repo.

Please go ahead. I created several PRs for git-aliases, so that integrating them can get discussed in depth. But it should also allow to speed up merging okay-PRs.

If there are no objections, please don't wait any longer. Press the button. Thank you!

@bittner
Copy link
Contributor Author

bittner commented Nov 17, 2023

Can we merge this minor enhancement?

@bittner
Copy link
Contributor Author

bittner commented Feb 6, 2024

Is there any chance to get this PR merged? 🙏

@seefood seefood merged commit 5a17fe6 into Bash-it:master Nov 6, 2024
6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants